Merge from mainline.
authorKatsumi Yamaoka <katsumi@flagship2>
Tue, 29 Jun 2010 12:08:56 +0000 (12:08 +0000)
committerKatsumi Yamaoka <katsumi@flagship2>
Tue, 29 Jun 2010 12:08:56 +0000 (12:08 +0000)

Trivial merge